bitkeeper revision 1.1159.140.1 (4181ff24XlmzOzk2yZmMG4lRU9Mr7Q)

Added missing header dependencies.
Added an optimize switch (defaults to "y") to make it easier to
build "-g -O0 -fno-omit-frame-pointer" versions of xen.

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 8b3128c38a80953cd9dc5fa7564140fad9ba3fe7..12fde1e8e4fcffdba06ba3d30e3647762f76b9d9 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -4,6 +4,7 @@ debug       ?= n
 debugger    ?= n
 perfc       ?= n
 trace       ?= n
+optimize    ?= y
 
 # Currently supported architectures:
 #  {COMPILE,TARGET}_ARCH    := x86
@@ -19,6 +20,7 @@ HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
+HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
 # compile.h is always regenerated, but other files shouldn't be rebuilt
 HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
 

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index e419bba51462165d523288730b49d3466b6c6374..fd4577f48cfab8010de55d1dbb949c37f8717b58 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -4,10 +4,17 @@
 CC := gcc
 LD := ld
 
-CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing -O3
-CFLAGS  += -iwithprefix include -Wall -Werror -fomit-frame-pointer -pipe
+CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS  += -iwithprefix include -Wall -Werror -pipe
 CFLAGS  += -I$(BASEDIR)/include -Wno-pointer-arith -Wredundant-decls
 
+ifeq ($(optimize),y)
+CFLAGS  += -O3 -fomit-frame-pointer
+else
+x86_32/usercopy.o: CFLAGS += -O1
+endif
+
+
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS  += -msoft-float